upstream 3.0.73