Add and correct javadocs
Merge remote-tracking branch upstream/$:{upbranch}