Merge branch 'hotfix/regex'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fixed error view.
Merge branch 'hotfix/fixedErrorView' into develop