merge EventsController::add() from develop