Merge branch 'JAL-1164_disorderforselection' into Release_2_8_1_Branch