Resolved upstream