Merge "Make checkpoint_gc.sh robust against interference"