[backfire] backport mini_fo fixes from r22057