Merge "Fix broken gradient truncation" into pi-car-dev