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

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