Changelog update and sql fix for 1228