Changes to match updates in NFS.
Merge remote-tracking branch 'origin/next' into vault
Another fix for MSVC errors.