Sync CHANGELOG with 2-1-stable branch