Merge branch 'JAL-1587_promotedisorder' into develop