Rebase due to Fuel upstream change