[backfire] merge r22806