Sync changelog with -109