Merge "Fix javadoc" into main