Add extends key and resolution
Merge branch 'master' into feature/extends
Add extends functionality
Merge branch 'feature/extends' into develop