Merge pull request #16083 from alalek:issue_14961