Merge "Don't rely on fallthrough in incident_section_gen"