Merge branch 'hotfix/html-sanitization' into 'develop'