updating changelog
Downmerge changelog