DSSSM-426 #time 3h Resolving an issue related to the addition and removal of tokens from one field, followed by the addition of a token from another field