sync with internal repo
undo use of component index