Merge branch 'feature/improve-error-logging' into 'develop'