Merge pull request #16594 from alifrumin/rn-5.23