Commit of 2013-04-24 about VFS (not all)