Cleanup ( CHANGELOG )
(cherry picked from commit 496e5d4)