IOSCE-324, IOSCE-290 Added CDATA and bug fix.