[OS-BUILD PATCH 2/2] Merge branch 'os-build' into '2-Makefile-GIT-macro'