Merge branch 'connectivity-abstraction' to master