[GAIA BUG1018819] - Move globals