OZP-73: Add rollback functionality
Merge branch 'master' into feature/ozp-73-persistence-api
OZP-73: Persistence update
Merge branch 'master' into feature/ozp-73-persistence-api
Merge branch 'feature/ozp-73-persistence-api'