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

Change-Id: If12ca693de9a022531cb4f4aafce2b4e428b567f