Merge "Various fixes in setting globals in a script group" am: c011ffd842 am: 7ee861abae
am: 89baba188e

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