CON-1073: Additional changes for GlobalHeader AB testing