[backfire] merge r22973