JDK 1.8 migration - work in progress