Merge sprint 7 into dev_r2022.0

Philipp Dietl requested to merge dev_r2022.0_sprint_7 into dev_r2022.0

Merge request reports