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