fix
Merge remote-tracking branch 'origin/dev' into dev

* origin/dev:
  fix dnd for all