Merge "Reference framework-connectivity stubs explicitly" into sc-dev