removed shadow properties from mixin
Merge branch 'f/noshadow' into dev
Merge branch 'dev' into feature/manage