Merge "Add ConnectivityAnnotations class" into sc-dev