Rollback design to current master
Encoder and bumper fixes