Merge branch 'develop'
fix type typo