Reviewed-by: jwaters, coleenp
Reviewed-by: kevinw, kbarrett, dholmes
Reviewed-by: cjplummer, sspitsyn