Merge "SnapshotManager::Return -> Return"