[backfire] merge r29403