issue #18983: moved in a lot of incident/connect code