Fixing a crash in i7 Alerts display page
Merge branch 'work_branch'