Remerged Scraper and Node with Jazzy's updates