XD-1787 JavaDocs