[backfire] tools: merge r30479