Fix fuel reduction
Merge origin/master