Re: [OS-BUILD PATCHv2] Use upstream/master for merge-base with fallback to master