[backfire] merge r23657