Rebase: fuel-mirror upstream changes