upstream 6.0.3