Merge pull request #14889 from alalek:issue_14863