some event barrier testing
fix merge errors caused by the fool Will