WIP test patch for synthetic events