Draft: Issue 9

Maxime Lefrançoisrequested to merge
issue-9 into develop-v2.1.1

This is a draft MR. started to implement what's in the change log of ts V2.1.1

Merge request reports