Update component/model
Merge branch 'master' into design