Always return batch object
PLAT-1588 #time 1h
$targetFlavor could be null
PLAT-1588 #time 30m
Merge pull request #1458 from kaltura/IX-9.20.0-PLAT-1588

Ix 9.20.0 plat 1588