Update changelog for 21788