Merge branch 'local-Makefile' into test-makefile-merge