[backfire] merge r32648 and r32649 (#12005)