[backfire] tools: merge r27052