Merge branch 'hotfix/mixin'
fixed inherit
Merge branch 'hotfix/inherit' into develop