merge SelectList updates from 2.0 Branch