NEXUS-6176: Applied comments