Merge branch 'refs/heads/t/makefile_conventions'