issue #20237: Fix show stopper problems with incident.