[backfire] merge r31258