Fixed issue #8083: Token attributes being mapped to the CPDB cannot be properly used
Dev Partial fix