should not add blank primary key to model fields
Merge remote-tracking branch 'origin/master'