Merge pull request #4997 from lambdageek/bug-57222