branch-2 + jdk7