[backfire] merge r27160