Merge "Make javadoc adhere to implementation"