Merge pull request #4814 from 23Skidoo/issue-4793