Merge "Easy connect API changes." into sc-dev