upstream 3.0.60 -> 3.0.70