Merge "Update the merger recent dict when saving the repo state" into feature/zuulv3