See ticket bpfd-170
Merge branch 'hotfix-batch'