[backfire] merge r22757