Release notes for #1476, #7484.