Merge "Remove onboarding of old solution subscription model"