After a stop, stop
Merge branch 'fix-could-consume-more-after-stop'