[backfire] merge r30927