Merge "Fix API javadoc link" into main