Incorporated many changes from the client project, too many commits to make cherry-picking effective, so just diff|patched all changes over. Ugly, but effective.