[OE-3446] used the cleaner way of triggering batch mode