Merge "Fix SnapshotTest crash" into main