upstream 4.7.0