Regular merge of develop

Closed Laurent Heirendt requested to merge develop into master

Merge request reports