Merge pull request #4453 from lambdageek/bug-49721