upstream 4.0.7