Merge branch '2834_disable_vfs'