Fix TU
Merge branch 'master' into java8