esl-9049 Update javadocs from Simon's branch