upstream 5.5.1