[backfire] merge r20675