[Nsi-wg] r98 issues