Merge pull request #1777 from JosJuice/filemonitor-volumedirectory Add FileMonitor support for VolumeDirectory