Merge pull request #23049 from alalek:issue_23048