Add ComponentSelector
feature: PSI portion
#1196
Merged
ComponentSelector
feature: PSI portion
#1196