[backfire] merge r27449