Rebase and fix changelog issues