NEXUS-6356: Improved logging