Add Shift, test more. It drives!
Merge branch 'master' into develop