this entity does not have an id column
Merge remote-tracking branch 'origin/release' into release