[OS-BUILD PATCH] Config consolidation into common