Merge branch 'develop'
ignore console error log