Not really a PR; just to keep track of the changes we have on top of dave's waddrmgr branch