Merge "Various fixes in setting globals in a script group"
am: a323d4ba02

* commit 'a323d4ba027835d61635cbaa607b45807e2c870b':
  Various fixes in setting globals in a script group