Reviewed-by: art

Reviewed-by: alexsch, yan
Contributed-by: NTaras Ledkov <taras.ledkov@oracle.com>

Reviewed-by: darcy, weijun