[OS-BUILD PATCHv5 3/3] Merge branch 'os-build' into '1-process_configs'