Merge branch 'hotfix/unittestfixes'
no forking for buildhive ci
Merge branch 'hotfix/no-forks' into develop