Update with latest changes for upcoming release.