Merge upstream dasein changes