testing pull request
Merge branch 'hotfix/fix-6' into develop