Merge branch 'development'
See ticket bpfd-170
Merge branch 'hotfix-batch'
Merge branch 'master' into development