[NASS-922]