Slightly refactor TargetSelection in bootstrap
#128983
Merged
TargetSelection in bootstrap
#128983