Added a rerolled patch.
Resolved the conflicts in files :
1. DraggableListBui...