Merge "Onboard merge subscriptions model"