Reviewed-by: mduigou, chegar, alanb
Reviewed-by: xdono
Reviewed-by: darcy, weijun
Reviewed-by: dholmes, martin
