merge in upstream dasein changes