Merge "Uplift to Fuel 10.0/Newton"