[backfire] merge r23231