Merge branch 'master' into t12_macro_project_sorting