r22751: Next step for the cluster merge: sessionid.tdb should contain a 'struct