OZP-73: Persistence update
Merge branch 'master' of https://github.com/ozoneplatform/ozp-kernel