[backfire] merge r27979