Merge pull request #1820 from anandpdoshi/anand-wip

Validate Select Fields