GTNPORTAL-3428 Unify CDATA uses