Merge branch 'feature/strong-model-types' into develop