Update to upstream 3.0.58