NAS-2380 Rework after review CR-NAS-231