Prepared migration to JDK 8 (stay on JDK 7 compatibility mode due to Groovy compiler issues)