CON-806 | GloablHeader fixes after CR