Merge "Unify the way we process events on condition change and bucket boundaries."