upstream 5.5.41