Merge "checkpoint: Fix metadata file contents bug" into main