Merge "Handle GitHub comment reviews carefully" into feature/zuulv3