Merge pull request #3778 from jjm2473/patch-4