Merge remote-tracking branch 'origin/BETA_JAVA_12'