NEXUS-5673: No code change, just issue refs