Merge branch 'hotfix/3.5.3-2'
improved error reporting
Merge branch 'hotfix/3.5.3-3' into develop