[backfire] merge r20669