FORGE-1379: Scaffold is now part of core