[Component] Various for components-2 branch

I can squash the commits if you want