DON'T MERGE TO MASTER!!! ENG-5373. Use Java 1.6