Merge pull request #23348 from nmav/bug/23185