Merge "Make service-connectivity APEX-only" into sc-dev