update changelog to appropriate the cherry-pick