BPFD-231 Merge branch 'hotfix-batch-not-triggered' into development
Merge branch 'development'