Merging latest changes.