Release 5.11 back merge

Merged Sebastian Müller requested to merge release_5.11 into develop

This merges changes during release back into develop.

Merge request reports