Quick fix for processing in batches(chunks)
Merge remote-tracking branch 'origin/devel' into devel