Add TOCMaker back from master.