upstream 3.0.90 -> 3.0.101