+ changes for BaseEventTypeController refactor
Merge branch 'feature/controller-refactor' into release/1.6