[OS-BUILD PATCHv2 2/2] Merge branch 'os-build' into '0114-Makefile'