case 4287 - Avoid double entity encode.
Merge branch 'case-4287' into develop