[backfire] merge r20739