Cherry-pick on Core :  Behaviour sortable, add property key sort_twins