upstream 3.0.50 -> 3.0.60