Fixed multi-tenancy issue when CDA resources are shared between users #67