Reviewed-by: erikj, dholmes, ihse
Reviewed-by: dholmes, jiangli, hseigel, lfoltan, sspitsyn
Reviewed-by: darcy, ihse