[backfire] merge r27196