Merge remote-tracking branch 'origin/master' into BETA_JAVA18

Change-Id: I51b1a7c0d3c5ae179849a091cb285d5cd7c61f7b