fix id type crash issue
Merge branch 'develop'