Reviewed-by: chegar, alanb, mduigou, ngmr
Contributed-by: NCharles Lee <littlee@linux.vnet.ibm.com>