rebase for recent changes in jdk8/tl