[NPJS-108]

[NPJS-108]