PLA-719 fixing select display on ff
Merge remote-tracking branch 'origin/PLA-719' into PLA-719