[#76663062] added more multi-tenancy items for onboarding