Merge branch 'develop' into 'cleanup/masto_fe-default_settings'