Reviewed-by: ahgross, briangoetz, dlsmith, rfield
Contributed-by: daniel.smith@oracle.com