Merge "docs: Made javadoc references less ambiguous" into mnc-docs