[backfire] merge r27132