[OS-BUILD PATCH] Partial revert: Add master merge check