Merge pull request #5120 from lambdageek/bug-57744