Merge "Add javadoc" into nyc-dev