Merge "Resolve hidden connectivity methods dependency" into sc-dev