am ac99db27: Merge "Optimizing: Speed up HEnvironment use removal"

* commit 'ac99db2751f1ac432a84739e7a4e011579296caf':
  Optimizing: Speed up HEnvironment use removal