Regular merge of develop

Merged Laurent Heirendt requested to merge develop into master

Merge request reports