Merge branch 'hotfix/unit-tests' into develop
Merge branch 'develop'