Select default value fix
Merge remote-tracking branch 'origin/master' into EVENT-89
Set choice amount