[Nsi-wg] updated version of GFD-I-217