Re-iterate on #7533 - move more CBOR parsing to using wrappers - settle on the interface - generate CBOR data with all types of fields and unit-test the interface