t434 - Adding dropdown instead of text field, and JS to support change
Merge remote branch 'origin/7.x-4.x' into 7.x-4.x