Merge branch 'dev' into t50_hide_project_icon_placeholder