Merge "JavaDoc fixes" into main