[backfire] merge r20733