LILY-507: make Type required & case should be assignable to Contact without Account
Hotfix: add tenantmanager
Merge branch 'hotfix/0.2.31.8'