Bug 6743: GBP HA improved