Merge branch '2834_disable_vfs' into 4.8.1-stable