fix id uniq issue
Merge branch 'fix_id' into dev
Merge branch 'dev'