[backfire] merge r26740