Merge upstream Dasein changes down to TWC fork