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

Change-Id: I024604d6ae6aae0d9e029069f5d00cdfaf10120c