Add ChangeLog entries for #16784 and #16786