[NASS-822]