Bug #3251: Highlight row in multiple choice selection
Merge remote-tracking branch 'origin/master' into feature-3175