Rebase Fenix patches to Fenix 83.0