Merge branch 't12_macro_project_sorting'