Merge remote-tracking branch 'origin/BETA_JAVA9' into R4_7_maintenance