fix primaryKey / remove virtual IDs
Merge branch 'develop'