Merge pull request #5156 from lambdageek/bug-57850+57851