upstream 5.4.33