Bug 573521 : Merge remote-tracking branch 'origin/master' into BETA_JAVA17

Change-Id: I7eda581a1e0ec7ccb9ebb11d233b7d8db2da4cff