Merge pull request #18551 from alalek:issue_17964