[backfire] merge r28146