CBIT-532:  swith order of GO flags

Change-Id: I919b5ac0631a56d4554d027626541b033260fed0