Merge pull request #22634 from nmav/fix-22632