Development into master

Closed M2113 requested to merge development into master

Merge request reports