Merge branch 'JAL-1587_promotedisorder' into Release_2_8_2_Branch