Backporting CHANGELOG entries from 1.6.4.x branch.