Update CHANGELOG.md See merge request !2068 (cherry picked from commit 3944807e) 9e6ff05f Update CHANGELOG.md