Post merge cleanup: improve changelog