[NASS-892]