Merge "Remove deprecated cmSubscription code"