upstream 5.5.19