Fixed id columns with wrong length
Merge remote-tracking branch 'origin/master'