Merge develop into master for hot fix

Merged LaurentMT requested to merge develop into master

Merge request reports