Merge "Merge from master to CA branch" into connectivity-abstraction