Reviewed-by: darcy
Reviewed-by: alanb, chegar
Reviewed-by: mduigou, chegar, abuckley
Reviewed-by: darcy, weijun
