Merge "Fix retry accounting off-by-one bug" into feature/zuulv3