[Nsi-wg] Issue #36