Fixed issue #8683: Unique custom token values fail to merge in invite/reminder emails
Dev Partial fix