upstream 5.4.30