changelog entries for #15866 and #15848

/cc @sgrif