Merge pull request #4564 from JosJuice/volumedirectory-references VolumeDirectory: Don't use references inappropriately
