Merge remote-tracking branch 'jk/vfs' into work.misc