NEXUS-4580: No code change, comments fixed