Update CHANGELOG
Merge branch 'release-1.12'