Do not stop the cursor process before the batch is empty
Merge branch 'feature/redesign'