re #7176 removing the method doneAddingEventLists()
Merge branch 'feature/7176_remove_doneAddingEventLists' into develop