update from v6_develop

Merged Sebastian Müller requested to merge v6_develop into mpr_finalize

Merge request reports