Merge to fix upstream problems