Merge pull request #3294 from lambdageek/dev/fix-42625