[OS-BUILD PATCHv3 4/4] Merge branch 'os-build' into '4-Makefile-GIT-macro'