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

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