Fixed BPFD-370
Merge branch 'hotfix/BPFD-370'