2i: improve JavaDoc.
Merge branch 'develop'