[backfire] merge r23264