Merge pull request #4923 from lambdageek/bug-56694