am 1cee95d5: Merge "Allow entropy to be provided to some operations"

* commit '1cee95d56478ad43b32c8c96119825ea358550e8':
  Allow entropy to be provided to some operations