Regular merge of develop

Merged Laurent Heirendt requested to merge develop into master

is this already ready to be released?

Merge request reports