upstream 6.0.2