Merge branch 'hotfix/octopack'
Fixed breaking tests
Merge branch 'hotfix/fix-tests' into dev