jdk

d4218464 - adjust to preferred scale in each branch for speed