Merge latest drag+drop improvements