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