Javadoc
Merge origin/branch3 into branch3