am a83cf577: Merge "Add support to indicate whether intrinsics require an environment"

* commit 'a83cf577d770f389f941b7798c8ea19d55a2e037':
  Add support to indicate whether intrinsics require an environment