Text Subscriptions feature
Fix conflicts after merging MH-771 to dev