Bug 3738: GBP coexistence fixes