cdata support

Change-Id: If1c071bfad83065a0748554fb048edbb7214b803