Relevant changes to be updated in master and then merged to BETA_JAVA27
Relevant changes to be updated in master and then merged to BETA_JAVA27