[OS-BUILD PATCH] Separate merge-upstream and release stages