Merge "Add timeout to check_connectivity method"