Merge "Wait for merger to complete before item is ready" into feature/zuulv3