Merge "Fixing up reference impl to match new CDDL"