Merge pull request #5272 from lambdageek/bug-58421