Add integer id type.
Merge remote branch 'origin/master'