[backfire] merge r22946