CAAERS-6746 CAAERS-6740 add externalId for marshalling