Update CHANGELOG

#4470 and #4592