[backfire] merge r22061