Reviewed-by: lancea, chegar, psandoz
Reviewed-by: xuelei, mullan Contributed-by: alexandre.boulgakov@oracle.com
Reviewed-by: darcy, weijun
