APD-324: Encoded html strings with raw method
Merge branch 'APD-324' into develop