CON-1888: Support bucky group