Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]
Add Release Note for #16622 [ci skip]
Merge pull request #17755 from zzak/changelog-for-16622

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