Merge pull request #23002 from alalek:issue_22206