Merge pull request #3331 from lambdageek/dev/test-for-42625