upstream 5.4.36