Merge "Replacing manual CBOR with serde-cbor"