Merge 'security-basecamp' branch into master with CBOR