Reviewed-by: chegar, coffeys, smarks, mullan
Contributed-by: alan.bateman@oralce.com, mark.sheppard@oracle.com