FLUID-52844: Modified globals declaration