NEXUS-5993: blah, copy paste
NEXUS-5993: Minor changes
NEXUs-5993: Javadoc and minor change

like inlining a const used only once