Component updates
Merge branch 'develop'