[backfire] merge r23293