Merge "Fix remote connectivity checks"