Fixes ITC-562
Merge remote-tracking branch 'origin/dropdown_fix'