Better createComponent
Merge branch 'master' into deploy