Better persistency gestion
Merge