Feature/cfd 115 events overview