Minor updates.
Merge remote-tracking branch 'origin/next' into nfs_change