Update to latest version

These are the latest upstream changes.