KRACOEUS-7065 moving some persistence code into sys
Merge pull request #56 from leoherbie/move_diag

KRACOEUS-7065 moving some persistence code into sys