[backfire] merge r31249