Merge "Fix SnapshotRecord being overwritten when requesting a new one." into main