Merge "Fix drag and drop (1/3)"