Merge "Workaround for javadoc issue"