Change id field from int to string
Merge remote branch 'upstream/master'