Reviewed-by: alexsch, malenkov
Contributed-by: NDmitry Ginzburg <dmitry.x.ginzburg@oracle.com>

Reviewed-by: art

Reviewed-by: darcy, weijun