Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]

cc @chancancode