Merge pull request #18509 from alalek:issue_18392