Issue #2803061 by BR0kEN, xavier.masson, vsujeetkumar, bhanu951: Cleanup of batches is never performed, add batch cleanup after execution of batch.
Closes #2803061