NEXUS-5348: Applied comments