shared attributes
Merge branch 'feature/cleanup' into develop
Merge branch 'develop'