Merge pull request #4508 from EmmanuelMess/emmanuelmess/fix/cdata_text_2