Merge pull request #1860 from JosJuice/volumedirectory-regression Fix 4.0-4901 VolumeDirectory stack overflow
