Merge "u/fuel: Bump & rebase for state break & retry"