Merge "Update cm-data-subscriptions model"