5410 draw mandatory select fields
Merge remote branch 'cheby/5410'