Nullable and javadoc, no code change