Merge branch 'hotfix/fixedErrorView' into develop
Merge branch 'develop'