Merge branch 'feature/inherit'