Merge "u/fuel: Bump & rebase for reclass class order fix"