[backfire] merge r26589