fix error merge
test persistence specialization of Generic
Merge remote-tracking branch 'origin/dev' into erik