#20346 release notes and maintainability tweaks