Changelog update and fix #1078 forward port