Dev merge2021.2.0 merge hotfixes

Nico Bugl requested to merge dev_merge2021.2.0_mergeHotfixes into dev_Merge2021.2.0

Merge request reports