Changed CDATA for review

This is experimantal and might not work either. Could need to revert
the last two commits.

Change-Id: I131e5c90faa0c830fe64b756dd3dd26d41b8a970
Cathegory: bugfix