SPP-96 SPP-122 #time 49m Resolving issues for FN tokens within headnotes