Merge "Manage and unmanage snapshot"