Merge "Improving drag and drop"