Merge "Return resulting commits from merger" into feature/zuulv3