Merge "Follow javadoc convention"