Summary: Also reviewed by Alexander Fomin and Andrew Gross
Reviewed-by: wetmore

Reviewed-by: mullan

Reviewed-by: darcy, weijun