EntityBase.ReadonlyEntity Fix
Merge branch 'Fix-EntityBase-ReadonlyEntity'