The changes for trunk are less extensive, but include