Update CHANGELOG.md See merge request !2344 (cherry picked from commit cf93a36a) 02456ae9 Update CHANGELOG.md