Reviewed-by: coffeys, alanb, skoivu

Reviewed-by: alanb, chegar, coffeys

Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar

Reviewed-by: yhuang

Summary: fix also reviewed by Alexander Fomin
Reviewed-by: alanb, coffeys, skoivu

Reviewed-by: chegar, coffeys, dfuchs

Reviewed-by: alanb, mchung, skoivu