Changes:
* Fix for Drag and Drop