t285- Add auto selects in place where there is only one available to select.
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa
t285- Add auto selects in place where there is only one available to select.