Reviewed-by: alanb, mduigou, psandoz, ulfzibis
Contributed-by: NAkhil Arora <akhil.arora@oracle.com>