upstream 4.0.6