Merge "Fix javadoc warnings in common concepts"