Merge pull request #18447 from alalek:fix_17953