Merge "Fix full backup of shared storage"