Merge "Add missing volume snapshot skip"