Reviewed-by: ihse, erikj, dholmes
Contributed-by: ingemar.aberg@oracle.com, magnus.ihse.bursie@oracle.com