Can we merge wrapAggregateId and wrapSagaId?