NAS-2388 Rework after review CR-NAS-232.