upstream 3.0.80 -> 3.0.90