merge event interceptors to 3.0