Merge Dasein upstream into TWC