Fix javadoc issue
Merge branch 'master' into 7.0