Jump drive support

Merging jump drive support into master