Merge "incident_helper: Fix incorrect deletion" into rvc-dev