Closes TMSS-1109
Also please delete branches TMSS-1109-system-event-filter, TMSS-1110-created-by, TMSS-1110-update-bugfix as they are already merged into this branch