upstream 5.4.2