Merge pull request #1224 from marcel-blonk/PLFM-2696

check file ids in batch calls
Merge remote-tracking branch 'upstream/develop' into PLFM-2713