Merge remote-tracking branch 'origin/R4_13_maintenance' into BETA_JAVA13

Change-Id: I0d768a8338a67dd2ab80e3cdce74c69e3448bdf4