Merge branch 'master' into develop
Fixed defaultPrevent
Merge branch 'develop'