Just to sumarize we have been discussing at skype... this PR should include in its scope the `-multitenant` CLI option.