Merge branch 'feature/purge-db4o' into develop