[backfire] merge r29901