Update CHANGELOG.md See merge request !2369 (cherry picked from commit b4593df0) 0a0b6601 Update CHANGELOG.md