Merge from master to connectivity-abstraction branch