[OS-BUILD PATCH 0/3] Prepare to separate out merge upstream step