Refactor persistency to persistence
Use database in EN text
Merge commit 'a698da56b713a8dfbfa9ee6f7d5ecda8f4cbb0b0'
Merge commit en_cleanup.