DSS-175 #time 3h 30m Resolved issue related to the modification of token markup structure