Issue #3315016: Use batch builder

Oleh Vehera requested to merge issue/filefield_paths-3315016:3315016-use-batch-builder into 8.x-1.x Oct 12, 2022