Merge "Non-primary CMMs are never explicitly connected" into sc-dev