Merge upstream Dasein changes into TWC fork