Merge "[ToA] Add more details in javadoc" into main