Merge pull request #13423 from alalek:issue_13418