enabled security for multi-tenancy
merge