Merge branch 'feature/mvp-core-with-protected-objects' into development