Merge upstream Dasein changes into TWC fork.

Second attempt...