@R changes for JDK 1.8
@P published to github