Merge branch 'master' into develop
Changed log level
Merge branch 'develop'