[backfire] merge r23643