beta_java_18_3 branch merged  to master