I tried to do similar as previous behavior, which did not process any more after the FlushAndStop marker