Merge pull request #20351 from alalek:issue_20320