Merge "Rewrite furnace"