[backfire] merge r31271