[backfire] merge r23419