[backfire] tools: merge r29929