Merge "Retry getting CatChange RC from master"