Merge "Fix broken Drag and Drop" into main