Merge change 3535

* changes:
  Move placement of script enviroment data to base.