Merge branch 'bug/JAL-1460_dragndropWindows' into releases/Release_2_10_4_Branch