Merge "Fixed javadoc error" into main