FORGE-1789: Updated to Roaster 2.3.1-SNAPSHOT