Merge branch 'feature-c/hotfix-2022-06' into 'dev'

Feature c/hotfix 2022 06

See merge request !1204
30 jobs for dev in 94 minutes and 30 seconds (queued for 3 seconds)