Merging changes for next release.
Resolve conflicts.