case 2104 - Removed Events menu entry.
Merge branch 'case-2104' into develop