case 3659 - Move choice column to the right.
Merge branch 'case-3659' into new-search

* case-3659:
  case 3659 - Move choice column to the right.