Include env variables defined in a dependency in the step itself.

Include env variables defined in a dependency in the step itself. #3622