[backfire] merge r27779