upstream 5.5.39