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