Merge branch 'master' into feature/scenariochecker-obstacle-area

8 jobs for feature/scenariochecker-obstacle-area in 169 minutes and 37 seconds (queued for 1 second)