fixing local drive deps pt. 1
Merge remote-tracking branch 'origin/master'