Fixed bug in vfs plugin.
Merge branch 'test' into dev