Merge "Fix for unmanage and manage snapshot"