[backfire] merge r22251