[backfire] merge r22625