Merge branch 'hotfix/bug-fixes'
Merge branch 'hotfix/bugfix-174' into develop