Import upstream 0.42