Merge branch 'hotfix/0.6.2'
Show more errors, if any
Merge branch 'hotfix/0.6.2' into develop