Merge branch avigan into development

Merged Arthur Vigan requested to merge avigan into development

Minor modifications to test branch merging

Merge request reports