Merge "Fix javadoc indentation level" into main