NXCM-4979: Applied comments