Merge branch 'develop' into issue/make-language-switch-configurable

4 jobs for issue/make-language-switch-configurable in 3 minutes and 33 seconds (queued for 5 seconds)