backport robot timing fixes