Merge pull request #8299 from JosJuice/volumeverifier-performance VolumeVerifier: Performance improvements
