fixes BPFD-5
Merge branch 'hotfix-hide-test-button-issue-BPFD-5'