Sync with my tree.
Sync patches and wantlib