Merge "Remove hidden connectivity method usage"