Hotfix on the issue is working
Merge branch 'hotfix-batch-bpfd-212'
Merge branch 'development'
Merge branch 'master' into development