Merge branch 'master' into develop
Fix problem on log errors
Merge branch 'develop'