Merge "Fix a race conditon in `incident`." into rvc-dev