Merge "Don't restart input in the middle of a batch." into jb-mr1-dev