NAS-2383 rework after review CR-NAS-229.