Merge branch 'hotfix/error_logs' into develop
Merge branch 'release/0.3.5'