Merge "Fix race in waitUntilSettled" into feature/zuulv3