NX-620: Applied comments