[NSPS-545]