Fixed issue #8295: Data for additional token attributes is not saved