Merge "Add support to indicate whether intrinsics require an environment"