SPP-96 #time 5m Implementing handling for MDUL and MDNM tokens outside of the FN token (629-0852 line 210)