Merge "Refinements to drag/drop"