remove incorrect Deprecated import
activate unique check
add multitenancy hack
generate more imports
Merge remote-tracking branch 'refs/remotes/upstream/master'