upstream 5.4.32