Added fix for #21530 to 1.6.1 release notes.