Merge "CmDataSubscription status code update"