fix(upstream): rebase against fleet upstream changes