[FUEL-777] merge cobbler and update fuel