Merge upstream Dasein changes