Merge "Fix javadoc." into klp-modular-dev