Merge pull request #5073 from JosJuice/fix-volumeisvalid Fix VolumeIsValid being referenced even though it was deleted
