upstream 5.4.35