z_drive: modified controler
Merge remote-tracking branch 'origin/master' into HEAD