Merge branch 'develop' into frontend-switcher-9000