CBOR rebase onto master for merge/review