Merge branch 'release/1.0'
prevent to type is null
Merge branch 'hotfix/1.0.1' into dev