issue #20237: Fix show stopper problems with incident.
Merge pull request #330 from jrogelstad/20237

issue #20237: Fix show stopper problems with incident.