[OS-BUILD PATCH] Merge Upstream script fixes