Reviewed-by: martin, alanb, ulfzibis, mduigou
Contributed-by: NStuart Marks &lt;stuart.marks@oracle.com&gt;, Henry Jen <henry.jen@oracle.com>