Merge pull request #7287 from waynn/patch-1