Merge branch 'EnvControl-fixes'