Merge remote-tracking branch 'origin/R4_9_maintenance' into BETA_JAVA11


Change-Id: I08c37ae6dd2b2a88b62673874a5e1e708a86a310