Merge LocomotiveDebrisFix -> main again. No new changes except that this time we won't less Plastic mess it up.