Merge "Updates to onboarding and distributor api's"