Fine tune javadoc
Merge remote-tracking branch 'upstream/6.5'