[backfire] merge r20735