[backfire] merge r27650