Changes to match updates in NFS.
Merge branch 'vault' into next