Fix problem with PrimaryKeyAttribute
Update T4 Generation Templates