Merge "Use SnapshotManager"