Yesterday
Merge from fuel_latency_fix