Slowed down brosing while dragging
Merge origin/master