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