Merge branch 'hotfix/refactor' into develop
Merge branch 'develop'