Fixes Javadoc vulnerability
Merge branch 'javadoc-updates'