[PDI-9514] / [PDI-12770] - Fix batch scripts