Merge "Reland exporting create_snapshot" into main