Merge upstream dasein