Merge "BUG-4099: Groups pointing to ports"