Merge "Fix a race conditon in `incident`."