[backfire] scripts: merge r29944 - r29948