Drag improvements
Merge remote-tracking branch 'upstream/master' into added_features