Merge "Expand javadocs" into main