AGPUSH-762 Java 1.6 compatibility