and forward-port those changelogs too