[backfire] merge r22631