fixes

Philipp Dietl requested to merge sprint_7_am_fixes_pd into dev_r2022.0_sprint_7

Merge request reports