[FEATURE] GBI Gateway Discovery