Update CHANGELOG

#4836