Merging to production 2022-10

Merged Klaus Illmayer requested to merge develop into master

Includes merge requests !191 (merged), !192 (merged), !193 (merged)

Merge request reports