Merge branch 'bug/JAL-3154tableColumnDrag' into develop