- Drop upstreamed patches - Add a couple of regression tests - Temporarily disable tests - Minor cleanup