Add changelog for #3613

Also small cleanup