Update CHANGELOG for #496