Sync up the VFS changes from 2.2.x.