[OS-BUILD PATCH 0/6] Patch Breakout again.