Merge pull request #4767 from lambdageek/bug-55681