Merge branch 'master' into develop
case 4287 - Avoid double entity encode.
Merge branch 'case-4287' into develop
Merge branch 'develop'
Release: v1.20