Merge "Change checkpointing retry count to 2" into rvc-dev