Merge "Remove hidden connectivity method usage" into sc-dev