UP-4188:  Enhance javadoc comments