Reviewed-by: sla, ctornqvi, lfoltan, mchung, alanb
Contributed-by: alexander.kulyakhtin@oracle.com