Merge pull request #16196 from alalek:issue_13574