vilterp Merge pull request #23556 from vilterp/cherry-pick-23496 …