Reviewed-by: briangoetz, mduigou, mr
Reviewed-by: lancea, chegar, psandoz
Reviewed-by: mduigou, chegar, alanb
Reviewed-by: darcy, weijun
