Merge "Snapshot changes"