Side effect is that everyone will now merge the base branch in their feature branch before building. Will-fix: #11972