Merge branch 'develop' into feature/#327-make-the-theme-switch-configurable

4 jobs for feature/#327-make-the-theme-switch-configurable in 3 minutes and 50 seconds (queued for 7 seconds)