Reviewed-by: alanb, sherman, darcy, igor
Reviewed-by: sherman
Reviewed-by: darcy, weijun
Reviewed-by: martin
