Merge pull request #22767 from efahl/issue-22760