Merge "Fix CaptivePortalTest before R"