Remove html encoding from tag
Merge branch 'DDBNEXT-1295-BOZ' into develop