Fixed issue #8605: Unable to add token attribute fields