Merge pull request #13467 from alalek:issue_12594