[GAIA BUG1018819] - Move globals
Merge pull request #321 from michalbe/Bug1018819-temp

[GAIA BUG1018819] - Move globals