Merge "Update javaDoc to make it consistent"