Merge remote-tracking branch 'origin/bugfix/8323_sophos_warning'
refs #8330. Fix unknown ICP entry issue.

Add two additional ICP conditions.
Merge branch 'feature/8330_icp_events' into develop