Merge pull request #3896 from lambdageek/bug-46250