Merge branch 'vfsconf'