Typo ( CHANGELOG )
Cleanup
(cherry picked from commit 7159e58)