Merge branch 'feature/model-inheritance' into develop