Merge branch 'feature/complex-inheritance' into develop