diff --git a/CHANGELOG.md b/CHANGELOG.md
index 898854f7..2e7b8d51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 	
 ### Minor changes:
 * CDATA xml support (patch by David Cornejo, Netgate)
+  * Encode and decode (parsing) support 
 * Validation of yang bits type space-separated list value
 * Added -U <user> command line to clixon_cli and clixon_netconf for NACM pseudo-user tests
 * Added a generated CLI show command that works on the generated parse tree with auto completion.
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index f387cdf7..dc1cbca3 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -243,6 +243,8 @@ yang2cli_var_sub(clicon_handle h,
 		    if ((id=strchr(name, ':')) != NULL)
 			*id = '\0';
 		    cprintf(cb, "%s:%s", name, id+1);
+		    if (name)
+			free(name);
 		}
 	    }
 	}
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index 1f0db0cc..2386d561 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -297,31 +297,56 @@ xml_chardata_encode(char  *str,
     int   l;
     int   len;
     int   i, j;
+    int   cdata; /* when set, skip encoding */
     
-    len = 0;
+    /* First compute length (do nothing) */
+    len = 0; cdata = 0;
     for (i=0; i<strlen(str); i++){
-	switch (str[i]){
-	case '&':
-	    len += strlen("&amp; ");
-	    break;
-	case '<':
-	    len += strlen("&lt; ");
-	    break;
-	case '>':
-	    len += strlen("&gt; ");
-	    break;
-	default:
+	if (cdata){
+	    if (strncmp(&str[i], "]]>", strlen("]]>")) == 0)
+		cdata = 0;
 	    len++;
 	}
+	else
+	    switch (str[i]){
+	    case '&':
+		len += strlen("&amp; ");
+		break;
+	    case '<':
+		if (strncmp(&str[i], "<![CDATA[", strlen("<![CDATA[")) == 0){
+		    len++;
+		    cdata++;
+		}
+		else
+		    len += strlen("&lt; ");
+		break;
+	    case '>':
+		len += strlen("&gt; ");
+		break;
+	    default:
+		len++;
+	    }
     }
     len++; /* trailing \0 */
+    /* We know length, allocate encoding buffer  */
     if ((esc = malloc(len)) == NULL){
 	clicon_err(OE_UNIX, errno, "malloc"); 
 	goto done;
     }
     memset(esc, 0, len);
-    j = 0;
+
+    /* Same code again, but now actually encode into output buffer */
+    j = 0; cdata = 0;
     for (i=0; i<strlen(str); i++){
+	if (cdata){
+	    if (strncmp(&str[i], "]]>", strlen("]]>")) == 0){
+		cdata = 0;
+		esc[j++] = str[i++];
+		esc[j++] = str[i++];
+	    }
+	    esc[j++] = str[i];
+	}
+	else
 	switch (str[i]){
 	case '&':
 	    if ((l=snprintf(&esc[j], 7, "&amp; ")) < 0){
@@ -331,6 +356,11 @@ xml_chardata_encode(char  *str,
 	    j += l;
 	    break;
 	case '<':
+	    if (strncmp(&str[i], "<![CDATA[", strlen("<![CDATA[")) == 0){
+		esc[j++] = str[i];
+		cdata++;
+		break;
+	    }
 	    if ((l=snprintf(&esc[j], 6, "&lt; ")) < 0){
 		clicon_err(OE_UNIX, errno, "snprintf");
 		goto done;
diff --git a/lib/src/clixon_xml_parse.l b/lib/src/clixon_xml_parse.l
index 029baa8f..f9c43a93 100644
--- a/lib/src/clixon_xml_parse.l
+++ b/lib/src/clixon_xml_parse.l
@@ -104,11 +104,12 @@ int clixon_xml_parsewrap(void)
 
 <STATEA>"</"          { BEGIN(START); return BSLASH; }
 <STATEA>"<!--"        { BEGIN(CMNT); return BCOMMENT; }
+<STATEA>"<![CDATA["   { BEGIN(CDATA); _YA->ya_lex_state = STATEA; clixon_xml_parselval.string = yytext; return CHARDATA;}
 <STATEA>\<            { BEGIN(START); return *clixon_xml_parsetext; }
 <STATEA>&             { _YA->ya_lex_state =STATEA;BEGIN(AMPERSAND);}
 <STATEA>\n            { clixon_xml_parselval.string = yytext;_YA->ya_linenum++; return (CHARDATA);}
-<STATEA>"<![CDATA["   { BEGIN(CDATA); _YA->ya_lex_state = STATEA; clixon_xml_parselval.string = yytext; return CHARDATA;}
-<STATEA>.             { clixon_xml_parselval.string = yytext; return CHARDATA; /*XXX:optimize*/}
+
+<STATEA>.             { clixon_xml_parselval.string = yytext;        return CHARDATA; /*XXX:optimize*/}
 
 	/* @see xml_chardata_encode */
 <AMPERSAND>"amp; "     {BEGIN(_YA->ya_lex_state); clixon_xml_parselval.string = "&"; return CHARDATA;}
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index cd9a567d..93025cc1 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -1261,7 +1261,11 @@ ys_populate_identity(yang_stmt *ys,
 	}
 	/* add prefix */
 	cv_name_set(cv, idref);
-	cvec_append_var(ybaseid->ys_cvec, cv);
+	cvec_append_var(ybaseid->ys_cvec, cv); /* cv copied */
+	if (cv){
+	    cv_free(cv);
+	    cv = NULL;
+	}
 	/* Transitive to the root */
 	if (ys_populate_identity(ybaseid, idref) < 0)
 	    goto done;
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index 800dcdcb..0fbd63f5 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -153,6 +153,13 @@ new "cli show configuration eth& - encoding tests"
 expectfn "$clixon_cli -1 -f $cfg -y $fyang show conf cli" 0 "interfaces interface eth& type t<>
 interfaces interface eth& enabled true"
 
+new "netconf edit CDATA"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" "<rpc><edit-config><target><candidate/></target><config><interfaces><interface><name>eth/0/0</name><type>ex:eth</type><description><![CDATA[myeth&]]></description></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+#new "netconf get CDATA"
+#expecteof "$clixon_netconf -qf $cfg -y $fyang" "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name=eth/0/0]/description\" /></get-config></rpc>]]>]]>" "<rpc-reply><data><interfaces><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>"
+
+
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"