Merge pull request #5288 from lambdageek/bug-58454