Sync changes to support release.