Merged the wheel encoder fix.