[CAMEL-7456] Preserve get/set contract