Merge pull request #2768 from benthecarman/preimage-helper